Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <[email protected]>
Wed, 29 Jan 2014 13:07:50 +0000 (14:07 +0100)
committerAlbert ARIBAUD <[email protected]>
Wed, 29 Jan 2014 13:07:50 +0000 (14:07 +0100)
1  2 
include/configs/am43xx_evm.h

Simple merge